From 1d3846451d0a087bea168f8be14ec01b1483c371 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 21 Sep 2004 23:35:18 +0000 Subject: [PATCH] remove now unused arg variables. Tue Sep 21 16:27:19 2004 Manish Singh * gdk/gdk.c: remove now unused arg variables. * gdk/gdkinternals.h: declare _gdk_windowing_init (). * gtk/gtkmain.c (do_pre_parse_initialization): call gdk_parse_args () here instead of gdk_pre_parse_libgtk_only (). Should fix #153082. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/gdk.c | 2 -- gdk/gdkinternals.h | 2 ++ gtk/gtkmain.c | 2 +- 7 files changed, 39 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba42d4eeca..9868d769d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Sep 21 16:27:19 2004 Manish Singh + + * gdk/gdk.c: remove now unused arg variables. + + * gdk/gdkinternals.h: declare _gdk_windowing_init (). + + * gtk/gtkmain.c (do_pre_parse_initialization): call gdk_parse_args () + here instead of gdk_pre_parse_libgtk_only (). Should fix #153082. + 2004-09-21 Matthias Clasen * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ba42d4eeca..9868d769d4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Tue Sep 21 16:27:19 2004 Manish Singh + + * gdk/gdk.c: remove now unused arg variables. + + * gdk/gdkinternals.h: declare _gdk_windowing_init (). + + * gtk/gtkmain.c (do_pre_parse_initialization): call gdk_parse_args () + here instead of gdk_pre_parse_libgtk_only (). Should fix #153082. + 2004-09-21 Matthias Clasen * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ba42d4eeca..9868d769d4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Tue Sep 21 16:27:19 2004 Manish Singh + + * gdk/gdk.c: remove now unused arg variables. + + * gdk/gdkinternals.h: declare _gdk_windowing_init (). + + * gtk/gtkmain.c (do_pre_parse_initialization): call gdk_parse_args () + here instead of gdk_pre_parse_libgtk_only (). Should fix #153082. + 2004-09-21 Matthias Clasen * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ba42d4eeca..9868d769d4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Tue Sep 21 16:27:19 2004 Manish Singh + + * gdk/gdk.c: remove now unused arg variables. + + * gdk/gdkinternals.h: declare _gdk_windowing_init (). + + * gtk/gtkmain.c (do_pre_parse_initialization): call gdk_parse_args () + here instead of gdk_pre_parse_libgtk_only (). Should fix #153082. + 2004-09-21 Matthias Clasen * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): diff --git a/gdk/gdk.c b/gdk/gdk.c index c1c30b2f0d..7af44a5734 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -53,8 +53,6 @@ static int gdk_initialized = 0; /* 1 if the library is initialized, */ static gchar *gdk_progclass = NULL; -static gint gdk_argc = 0; -static gchar **gdk_argv = NULL; #ifdef G_ENABLE_DEBUG static const GDebugKey gdk_debug_keys[] = { diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index 1b3ccb4de2..b9e14eba46 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -238,6 +238,8 @@ void _gdk_colormap_real_destroy (GdkColormap *colormap); void _gdk_cursor_destroy (GdkCursor *cursor); +void _gdk_windowing_init (void); + extern GOptionEntry _gdk_windowing_args[]; void _gdk_windowing_set_default_display (GdkDisplay *display); diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 529600be50..8a7ef33588 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -437,7 +437,7 @@ do_pre_parse_initialization (int *argc, g_warning ("Locale not supported by C library.\n\tUsing the fallback 'C' locale."); } - gdk_pre_parse_libgtk_only (); + gdk_parse_args (argc, argv); gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL); #ifdef G_ENABLE_DEBUG -- 2.30.2